From 138d95a9a5c85529ffe18f3be6f2ea1c0793c851 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 7 Jun 2001 20:43:05 +0000 Subject: [PATCH] fixups for glib-mkenums and glib-genmarshal (not tested yet because with 2001-06-07 Havoc Pennington * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal (not tested yet because with absolute path to srcdir I can't build atk, but it was broken anyway so this may help) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk-pixbuf/ChangeLog | 4 ++++ gdk-pixbuf/Makefile.am | 16 +++++++++++----- gtk/Makefile.am | 35 +++++++++++++++++++++++------------ 10 files changed, 80 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3848e72803..bdca3473d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3848e72803..bdca3473d3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-06-07 Havoc Pennington + + * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal + (not tested yet because with absolute path to srcdir I can't build + atk, but it was broken anyway so this may help) + 2001-06-07 Havoc Pennington * configure.in: output m4macros/Makefile diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 1f5dcd6fbb..c816f783df 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,7 @@ +2001-06-07 Havoc Pennington + + * Makefile.am (gdk-pixbuf-marshal.c): fix up the glib-genmarshal path + 2001-06-05 Havoc Pennington * test-loaders.c (main): use putenv not setenv, reported by diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 2c873bfa59..a26cfebaa6 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -241,15 +241,21 @@ EXTRA_DIST = \ gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list - cwd=`pwd` \ - && cd $(srcdir) \ - && $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \ + case @GLIB_GENMARSHAL@ in \ + /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \ && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \ && rm -f xgen-gmh xgen-gmh~ gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list - cwd=`pwd` \ + case @GLIB_GENMARSHAL@ in \ + /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + esac; \ && cd $(srcdir) \ - && $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \ + && $$glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \ && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \ && rm -f xgen-gmc xgen-gmc~ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 16a2261412..d739526645 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -429,9 +429,12 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h: # never add deps here # srcdir to be writable, passing --disable-rebuilds to # ../configure will supress all autogeneration rules. $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) - cwd=`pwd` \ - && cd $(srcdir) \ - && $$cwd/@GLIB_MKENUMS@ --comments ";; @comment@" \ + case @GLIB_MKENUMS@ in \ + /*) glib_mkenums=@GLIB_MKENUMS@ ;; \ + *) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_mkenums --comments ";; @comment@" \ --fprod "; enumerations from \"@filename@\"\n " \ --vhead "(define-@type@ @EnumName@" \ --vprod " (@valuenick@ @VALUENAME@)" \ @@ -442,16 +445,21 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sourc && rm -f xgen-gdef \ && echo timestamp > $(@F) $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h - cwd=`pwd` \ - && cd $(srcdir) \ - && $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ + case @GLIB_GENMARSHAL@ in \ + /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $(@F) $(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h - cwd=`pwd` \ - && cd $(srcdir) \ - && $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ + case @GLIB_GENMARSHAL@ in \ + /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ + esac; \ + && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ && cp xgen-gmc $(srcdir)/gtkmarshal.c \ && rm -f xgen-gmc xgen-gmc~ $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h @@ -471,9 +479,12 @@ $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.def && cp xgen-gtbic $(@F) \ && rm -f xgen-gtbic $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources) - cwd=`pwd` \ - && cd $(srcdir) \ - && $$cwd/@GLIB_MKENUMS@ \ + case @GLIB_MKENUMS@ in \ + /*) glib_mkenums=@GLIB_MKENUMS@ ;; \ + *) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_mkenums \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ -- 2.30.2